From: Olof Johansson Date: Tue, 23 Jul 2013 02:50:11 +0000 (-0700) Subject: Merge tag 'davinci-fixes-for-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~8337^2~12 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cc23ee49d36fe5ce1435f75e5312bee9d76010c2;p=linux-4.9.git Merge tag 'davinci-fixes-for-v3.11-rc2' of git://git./linux/kernel/git/nsekhar/linux-davinci into fixes From Sekhar Nori: DaVinci fixes for v3.11-rc2 The pull request includes fixes for sparse warnings, defconfig changes to enable DMA usage on peripherals and removal of a duplicated include file. * tag 'davinci-fixes-for-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: defconfig: enable EDMA driver ARM: davinci: make file local variables static ARM: edma: remove duplicated include from edma.c Signed-off-by: Olof Johansson --- cc23ee49d36fe5ce1435f75e5312bee9d76010c2